Merge from trunk
authorJason Rumney <jasonr@gnu.org>
Fri, 8 Jan 2010 14:31:37 +0000 (22:31 +0800)
committerJason Rumney <jasonr@gnu.org>
Fri, 8 Jan 2010 14:31:37 +0000 (22:31 +0800)

Trivial merge